(print-help-return-message): If pop-up-frames is non-nil, don't display

message about scrolling the help window.

diff --git a/lisp/help.el b/lisp/help.el
index 067e02d5cefe2bcca49a1ae207b3ae19d8dd4971..9a779f14d0cf185705e59f2366c5f65057165482 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -159,7 +159,8 @@ specifies what to do when the user exits the help buffer."
                   (if first-message "  ")
                   ;; If the help buffer will go in a separate frame,
                   ;; it's no use mentioning a command to scroll, so don't.
-                  (if (special-display-p (buffer-name standard-output))
+                  (if (or pop-up-windows
+                          (special-display-p (buffer-name standard-output)))
                       nil
                     (if (same-window-p (buffer-name standard-output))
                         ;; Say how to scroll this window.